Visual Studio builds: Include Vulkan sources in GSK

...but disable them for now.  Configs will be added for the projects to
support Vulkan-enabled builds which will then enable the builds of these
sources.  Extra commands and items will be needed for the GSK resources
along with ensuring GSK_RENDERER_GSK being defined for the build of GDK,
GDK-Win32 and GSK so that the builds of Vulkan-enabled builds can be done
properly.

Filter out the Vulkan sources from the 'dist hook' rules in
gsk/Makefile.am as we don't want to in turn include them twice in the
projects when the 'make dist' is performed on a system with Vulkan
builds enabled.

diff --git a/build/win32/vs12/gsk-4.vcxproj.filtersin b/build/win32/vs12/gsk-4.vcxproj.filtersin
index 6b1f1c3e0b0b67ac25b4d058dfb1c8f46291a0bf..2cd5a45959a043265039b02ab0d5ffeb5afb043b 100755 (executable)
--- a/build/win32/vs12/gsk-4.vcxproj.filtersin
+++ b/build/win32/vs12/gsk-4.vcxproj.filtersin
@@ -20,5 +20,19 @@
   </ItemGroup>
   <ItemGroup>
 #include "gsk-4.vs12.sourcefiles.filters"
+   <ClCompile Include="..\..\..\gsk\gskvulkanblendpipeline.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanbuffer.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanclip.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkancolorpipeline.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkancommandpool.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanlineargradientpipeline.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanimage.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanmemory.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanpipeline.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanpushconstants.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanrender.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanrenderer.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanrenderpass.c"><Filter>Source Files</Filter></ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanshader.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>

diff --git a/build/win32/vs12/gsk-4.vcxprojin b/build/win32/vs12/gsk-4.vcxprojin
index 72062164279d944861230cbaac3537f07a11960d..0e32c2e1cb7ff300de5e1effeebc5a6838b26f9c 100755 (executable)
--- a/build/win32/vs12/gsk-4.vcxprojin
+++ b/build/win32/vs12/gsk-4.vcxprojin
@@ -154,6 +154,62 @@
   </ItemGroup>
   <ItemGroup>
 #include "gsk-4.vs12.sourcefiles"
+   <ClCompile Include="..\..\..\gsk\gskvulkanblendpipeline.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanbuffer.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanclip.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkancolorpipeline.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkancommandpool.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanlineargradientpipeline.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanimage.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanmemory.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanpipeline.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanpushconstants.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanrender.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanrenderer.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanrenderpass.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
+   <ClCompile Include="..\..\..\gsk\gskvulkanshader.c">
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+   </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/gsk/Makefile.am b/gsk/Makefile.am
index 31dc094eba9a40520513870970f9274e55c0c772..922c727f6df5983023f7c8c95c031780e41da8c4 100644 (file)
--- a/gsk/Makefile.am
+++ b/gsk/Makefile.am
@@ -211,7 +211,7 @@ endif
 MSVCPROJS = gsk-4
 
 gsk_4_FILES = $(all_sources) $(gsk_built_source_c)
-gsk_4_EXCLUDES = dummy
+gsk_4_EXCLUDES = gskvulkan*.c
 gsk_4_HEADERS_DIR = $(gskincludedir)
 gsk_4_HEADERS_INST = $(gskinclude_HEADERS)
 gsk_4_HEADERS_EXCLUDES = dummy